libjcat: update to 0.2.3

- New CLI build option
- Enable ed25519 by default

Release notes: https://github.com/hughsie/libjcat/releases/tag/0.2.3

Signed-off-by: Lukas Voegl <[email protected]>

diff --git a/libs/libjcat/Config.in b/libs/libjcat/Config.in
index db1528df7e1853c92c35fdf5cb492c9ae8ff9432..fe7bc1c21a4e250496cb6ceaee1df49c3ada5175 100644 (file)
--- a/libs/libjcat/Config.in
+++ b/libs/libjcat/Config.in
@@ -1,6 +1,12 @@
 menu "Select libjcat options"
        depends on PACKAGE_libjcat
 
+config LIBJCAT_CLI
+       bool "Command-line tool"
+       default n
+       help
+         Compile and install the libjcat cli tool
+
 config LIBJCAT_GPG
        bool "GPG"
        default y
@@ -15,7 +21,7 @@ config LIBJCAT_PKCS7
 
 config LIBJCAT_ED25519
        bool "ed25519"
-       default n
+       default y
        help
          Compile libjcat with ed25519 support
 

diff --git a/libs/libjcat/Makefile b/libs/libjcat/Makefile
index daece53035da5632a70ccaae3581e6e19770c415..4103450c78a3adbe5243c5a3ba0350241989b1b5 100644 (file)
--- a/libs/libjcat/Makefile
+++ b/libs/libjcat/Makefile
@@ -8,19 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libjcat
-PKG_VERSION:=0.2.1
+PKG_VERSION:=0.2.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/hughsie/libjcat/releases/download/$(PKG_VERSION)
-PKG_HASH:=a6232aeca3c3fab6dbb3bed06ec3832088b49a4b278a7119558d72be60ce921f
+PKG_HASH:=f2f115aad8a8f16b8dde1ed55de7abacb91d0878539aa29b2b60854b499db639
 
 PKG_MAINTAINER:=Lukas Voegl <[email protected]>
 PKG_LICENSE:=LGPL-2.1-or-later
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=glib2/host
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 include $(INCLUDE_DIR)/meson.mk
@@ -36,8 +34,7 @@ define Package/libjcat
        +LIBJCAT_GPG:libgpgme \
        +LIBJCAT_GPG:libgpg-error \
        +LIBJCAT_PKCS7:libgnutls \
-       +LIBJCAT_ED25519:libgnutls \
-       +LIBJCAT_ED25519:libnettle
+       +LIBJCAT_ED25519:libgnutls
 endef
 
 define Package/libjcat/description
@@ -50,13 +47,12 @@ define Package/libjcat/config
 endef
 
 MESON_ARGS += \
-       -Db_lto=true \
        -Dgtkdoc=false \
        -Dintrospection=false \
        -Dvapi=false \
        -Dtests=false \
        -Dman=false \
-       -Dcli=false \
+       -Dcli=$(if $(CONFIG_LIBJCAT_CLI),true,false) \
        -Dgpg=$(if $(CONFIG_LIBJCAT_GPG),true,false) \
        -Dpkcs7=$(if $(CONFIG_LIBJCAT_PKCS7),true,false) \
        -Ded25519=$(if $(CONFIG_LIBJCAT_ED25519),true,false)
@@ -78,6 +74,10 @@ endef
 define Package/libjcat/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjcat.so* $(1)/usr/lib
+
+       $(if $(CONFIG_LIBJCAT_CLI), \
+               $(INSTALL_DIR) $(1)/usr/bin; \
+               $(CP) $(PKG_INSTALL_DIR)/usr/bin/jcat-tool $(1)/usr/bin)
 endef
 
 $(eval $(call BuildPackage,libjcat))